auto merge of #811 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 7 Nov 2014 16:32:17 +0000 (16:32 +0000)
committerbors <bors@rust-lang.org>
Fri, 7 Nov 2014 16:32:17 +0000 (16:32 +0000)
Need to land them all as one unit to actually pass the whole test suite.


Trivial merge